From 606772a3f5bc59d09125ccfce147145afb471636 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 4 Dec 2018 01:31:04 -0500
Subject: [PATCH] Build DejaVu Sans Mono, not DejaVu Sans Regular

---
 Makefile.am                | 22 +++++++++++-----------
 configure.ac               |  4 ++--
 themes/starfield/theme.txt | 12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7795bae..8cdf794 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,22 +88,22 @@ build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c
 CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT)
 
 if COND_STARFIELD
-starfield_DATA = dejavu_10.pf2 dejavu_12.pf2 dejavu_bold_14.pf2 dejavu_14.pf2 dejavu_16.pf2 $(starfield_theme_files)
-dejavu_10.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
+starfield_DATA = dejavu_mono_10.pf2 dejavu_mono_12.pf2 dejavu_mono_bold_14.pf2 dejavu_mono_14.pf2 dejavu_mono_16.pf2 $(starfield_theme_files)
+dejavu_mono_10.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
 	./build-grub-mkfont$(BUILD_EXEEXT) -s 10 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_10.pf2
-dejavu_12.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
+CLEANFILES += dejavu_mono_10.pf2
+dejavu_mono_12.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
 	./build-grub-mkfont$(BUILD_EXEEXT) -s 12 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_12.pf2
-dejavu_14.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
+CLEANFILES += dejavu_mono_12.pf2
+dejavu_mono_14.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
 	./build-grub-mkfont$(BUILD_EXEEXT) -s 14 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_14.pf2
-dejavu_bold_14.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
+CLEANFILES += dejavu_mono_14.pf2
+dejavu_mono_bold_14.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
 	./build-grub-mkfont$(BUILD_EXEEXT) -b -s 14 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_bold_14.pf2
-dejavu_16.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
+CLEANFILES += dejavu_mono_bold_14.pf2
+dejavu_mono_16.pf2: $(DJVU_FONT_SOURCE) build-grub-mkfont$(BUILD_EXEEXT)
 	./build-grub-mkfont$(BUILD_EXEEXT) -s 16 -o $@ $(DJVU_FONT_SOURCE)
-CLEANFILES += dejavu_16.pf2
+CLEANFILES += dejavu_mono_16.pf2
 else
 starfield_DATA =
 endif
diff --git a/configure.ac b/configure.ac
index c7888e4..d590e0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1638,8 +1638,8 @@ fi
 if test x"$starfield_excuse" = x; then
    for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
      for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
-        if test -f "$dir/DejaVuSans.$ext"; then
-          DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
+        if test -f "$dir/DejaVuSansMono.$ext"; then
+          DJVU_FONT_SOURCE="$dir/DejaVuSansMono.$ext"
           break 2
         fi
      done
diff --git a/themes/starfield/theme.txt b/themes/starfield/theme.txt
index 5ec871b..d4b5b97 100644
--- a/themes/starfield/theme.txt
+++ b/themes/starfield/theme.txt
@@ -21,11 +21,11 @@
 # THE SOFTWARE.
 
 #general settings
-message-font: "DejaVu Sans Regular 12"
+message-font: "DejaVu Sans Mono 12"
 message-color: "#000"
 message-bg-color: "#fff"
 terminal-box: "terminal_box_*.png"
-terminal-font: "DejaVu Sans Regular 12"
+terminal-font: "DejaVu Sans Mono 12"
 desktop-image: "starfield.png"
 
 #help bar at the bottom
@@ -36,7 +36,7 @@ desktop-image: "starfield.png"
 	height = 20
 	text = "@KEYMAP_MIDDLE@"
 	align = "center"
-	font = "DejaVu Sans Regular 10"
+	font = "DejaVu Sans Mono 10"
 	color = "#FFF"
 }
 
@@ -46,9 +46,9 @@ desktop-image: "starfield.png"
 	width = 80%
 	top = 20%
 	height = 50%	
-	item_font = "DejaVu Sans Regular 12"
+	item_font = "DejaVu Sans Mono 12"
 	item_color = "#000"
-	selected_item_font = "DejaVu Sans Bold 14"
+	selected_item_font = "DejaVu Sans Mono Bold 14"
 	selected_item_color= "#000"
 	selected_item_pixmap_style = "blob_*.png"
 	icon_height = 25
@@ -70,7 +70,7 @@ desktop-image: "starfield.png"
 	top = 80%
 	height = 20
 	width = 70%
-	font = "DejaVu Sans Regular 12"
+	font = "DejaVu Sans Mono 12"
 	text_color = "#000"
 	fg_color = "#fff"
 	bg_color = "#6ac"
-- 
2.7.4

